From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 21 Dec 2013 16:12:52 +0000 (+0100)
Subject: Changelog for previous checkin, missed to mark.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~1861
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=df8b4c35120bcde0ce0b0f39e221033fdde7cd56;p=emacs.git

Changelog for previous checkin, missed to mark.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7ad7991c862..e2c5cf20167 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2013-12-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.h: Declare EmacsColor category.
+
+	* nsterm.m (NSColor): Implement EmacsColor category.
+	(ns_get_color): Use colorUsingDefaultColorSpace.
+	(ns_get_color, ns_term_init): Use colorForEmacsRed.
+
+	* nsfns.m (Fxw_color_values): Use colorUsingDefaultColorSpace.
+
 2013-12-21  Eli Zaretskii  <eliz@gnu.org>
 
 	* image.c (fn_png_longjmp) [WINDOWSNT]: Mark the function as